Auto merge of #4513 - durka:patch-6, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 20 Sep 2017 17:32:37 +0000 (17:32 +0000)
committerbors <bors@rust-lang.org>
Wed, 20 Sep 2017 17:32:37 +0000 (17:32 +0000)
commit31dd4e37d819c7eeb13388f8d92165c93cef5e9b
tree1e289a1bb3ec9c9a70e7b28ff332e31c3feeaa7e
parent7619c50e913ce75e73facc8d7caa9fbf00406f4e
parent32beb11aa72b92e73832626220a53718fe60319a
Auto merge of #4513 - durka:patch-6, r=alexcrichton

[patch] slipped to 1.21